Improve path fixing in cmake files via d/set-paths

Re-look at all these substitutions, hopefully now getting them all correct.

Closes: #1131536

diff --git a/debian/set-paths b/debian/set-paths
index 10229754fe1581075d2d0c83227fab7aaf4148ea..4a27843dbe2ffe3ce66f1c916d58712805a3e10e 100755 (executable)
--- a/debian/set-paths
+++ b/debian/set-paths
@@ -11,9 +11,9 @@ for directory in "cmake/Shiboken6" "cmake/Shiboken6Tools"; do
     sed -i "
         s|\"\${PACKAGE_PREFIX_DIR}/lib\"|/usr/lib/$DEB_HOST_MULTIARCH|;
         s|\${PACKAGE_PREFIX_DIR}|/usr|;
-        s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|;
-        s|\${_IMPORT_PREFIX}/include|\${_IMPORT_PREFIX}/../include|;
-        s|\${_IMPORT_PREFIX}/bin|\${_IMPORT_PREFIX}/../bin|;
+        s|\${_IMPORT_PREFIX}/lib|/usr/lib/$DEB_HOST_MULTIARCH|;
+        s|\${_IMPORT_PREFIX}/shiboken6/include|/usr/include/shiboken6|;
+        s|\${_IMPORT_PREFIX}/bin|/usr/bin|;
         s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide6\")|;
     " \
     debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*
@@ -38,10 +38,12 @@ package="libpyside6-dev"
 for directory in "cmake/PySide6"; do
     sed -i "
         s|\${PACKAGE_PREFIX_DIR}|/usr|;
-        s|\${_IMPORT_PREFIX}/lib|\${_IMPORT_PREFIX}/$DEB_HOST_MULTIARCH|;
-        s|\${_IMPORT_PREFIX}/include|\${_IMPORT_PREFIX}/../include|;
-        s|\${_IMPORT_PREFIX}/bin|\${_IMPORT_PREFIX}/../bin|;
+        s|\${_IMPORT_PREFIX}/lib|/usr/lib/$DEB_HOST_MULTIARCH|;
+        s|\${_IMPORT_PREFIX}/PySide6/include|/usr/include/PySide6|;
+        s|\${_IMPORT_PREFIX}/bin|/usr/bin|;
         s|^set_and_check(PYSIDE_PYTHONPATH.*|set_and_check(PYSIDE_PYTHONPATH \"/usr/lib/python3/dist-packages/PySide6\")|;
+        s|/usr/typesystems|/usr/share/PySide6/typesystems|;
+        s|/usr/glue|/usr/share/PySide6/glue|;
     " \
     debian/$package/usr/lib/$DEB_HOST_MULTIARCH/$directory/*
 done